Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 20:10:40 +0000 (12:10 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Jan 2012 20:10:40 +0000 (12:10 -0800)
commit672dd306ec4be64f47f30ee3ed4b5ed0467ac334
treedb0741a2660ac27ea1396db2a07f5510e7bab467
parent22308b92b07278edce8e5dcbcde03254d4303fe8
parent4d1a0a53e41795aff0a8acd22827739a28cca023
Merge from trunk.